fix quoting of *
Merge branch 'master' into gh-pages
up html