Some tidying
Merge branch 'master' into authentication