Fix for syntax highlighting
Merge branch 'develop'