Automatic syntax highlighting - detect language
Merge remote-tracking branch 'origin/master'