Fix Firefox 32.0 on Ubuntu 14.04.
Merge branch 'master' into gh-pages