SIGN IN SIGN UP

Merge from 3.2.

E
Eric V. Smith committed
c8e106babba7b54d38992ebed33ac3feb74b3cb5