SIGN IN SIGN UP

Merge from 3.2

N
Nick Coghlan committed
ab45e689be9e954de37fcb18d584fa09a19111f3