Merge branch 'development'
Minor adjustments to text...
Merge branch 'master' into development