style: Work around syntax highlighting fail
Merge remote-tracking branch 'origin/master'