Improve cross-browser compatibility.
Merge branch 'master' into gh-pages
Clean up files.
Merge branch 'master' into gh-pages

Conflicts: