Merge branch 'develop' into release/1.3
Merge branch 'release/1.3'
Merge branch 'develop' into release/1.3
Merge branch 'release/1.3'
Merge branch 'master' of git://github.com/CakeDC/users
Merge branch 'master' into develop