Merge branch 'hl-bugfix' into 'master'

Highlight bugfix

Fixes:

* snippet rendering bug #2011
* dev fixtures has invalid root user

See merge request !1532