no cgi escape for ht
Merge branch 'master' into staging