Merge pull request #1199 in master
Merge pull request #1200 in master
Fixes code blocks without highlighting

http://sphinx-doc.org/markup/code.html
Merge pull request #1203
Merge pull request #1203 in develop