Sync with master
Merge branch 'master' into develop
More edits.