SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
97751fa5c985055cd10e789702fdc33f0d30b8ad