Fix up syntax highlightning.
Merge branch 'master' into develop