SIGN IN SIGN UP

Merge 3.4 branch.

D
doko@ubuntu.com committed
a3b99a07e6d75d707b5c8a0cadb6b059638da650