SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
143d034ecd110f8543eba4ad76dfb6085cdaeb3d