Merge branch 'master', remote-tracking branch 'origin'
Escape dynamic value $nav_id when used as an attribute and html comment. Fixes #146 props @ounziw