SIGN IN SIGN UP

Merge with 3.4

Z
Zachary Ware committed
f25e3bfefa800c20c354843b345644ac80b646a8