SIGN IN SIGN UP

Merge from 3.2

N
Nick Coghlan committed
e27b3608ef04daa5e27029c329ad426782c9670c