Fix building error
Merge branch 'master' into firefox