Merge branch 'syntax-highlighting' into dev