Merge branch 'master' into login
Merge branch 'master' into login

Bringing login up to date.
Merge branch 'master' into login