SIGN IN SIGN UP

Merge with 3.4

T
Terry Jan Reedy committed
062bc1de1961268a371e4f968a9e455c325c819f