Fix problem in Firefox and Safari
Merge branch 'master' into gh-pages
Update builds