SIGN IN SIGN UP

Merge 3.2. Remove duplicate ACKS and reorder slightly to prevent future dups.

F
Florent Xicluna committed
c178d9bcc4c3255cd2d4268b597e5e41cfeafdee