hotfix for small Safari bug
Merge branch 'master' into jebeck/nurse-shark