Attempt to fix 10.9 + iOS 7 custom font issue
Merge remote-tracking branch 'upstream/dev' into dev-scons