Safe highlighting
Merge commit '2e0edcc' into gh-pages

Conflicts:
	index.md