SIGN IN SIGN UP

Merge 3.2

M
Michael Foord committed
a699a2d0c1a59aeaea47f50701c40a1cff18e4b6