SIGN IN SIGN UP

Merge with 3.4

T
Terry Jan Reedy committed
c69b37ff4e3ac3d20d1bcbb7caa305b118615583