SIGN IN SIGN UP

Merge with 3.4

T
Terry Jan Reedy committed
082c6cb18321ca07be0284b837b17da363d797e2