Whew!  Looks like everything works!
Merge branch 'master' into gh-pages
Update html