Fixed mac os crash
Merge branch 'master' into firefox