Fix docblock
Always use UTF-8
Enable syntax highlighting by default
Merge branch '1.3'