APT - Put back code removed during merge with 3.1 RELEASE
1 file changed