Merge branch 'master' into gh-pages

Conflicts:
js/html_actuator.js