Merge branch 'mr/gitweb-jsmin'