Still fixing FF
Merge branch 'master' into Xcode5-noSign