SIGN IN SIGN UP

Merge with 3.4

Z
Zachary Ware committed
dee46b370e9856e6bbeb624513cd2fb2fa0dbdf2