SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
8efe3df6642a1d29c6e8bafe18c038ed64b398c3