SIGN IN SIGN UP

Merge branch 'master' into 6.0

R
r0x0r committed
9dbd816c598b3b62516f0c16428f4d7a78e08f94