Merge branch 'master' into dev
Changed highlighting
Merge branch 'dev'