Merge remote-tracking branch 'origin/master' into 0.6-development
Merge branch '0.6-development' into github-releases
Work around editor's syntax highlighting