Merge branch 'develop'
The horros of cut and paste
Merge branch 'master' into develop