Merge branch 'develop'
Cosmetic changes.