SIGN IN SIGN UP

Merge AIX fixes from 3.5 into 3.6

M
Martin Panter committed
f8cebad2901799ebfceb3228a7ba69a504e21f75