Add html upload to the build not just shtml.
Merge remote-tracking branch 'origin/master'