Make things break less in FireFox ;)
Merge branch 'master' into gh-pages