Degrade gracefully in FF/Safari
Merge branch 'master' into gh-pages
Remove whitespace