Fixes font leading/metrics; hacks to resolve font face
Merge remote-tracking branch 'mozilla/master' into fonts-1

Conflicts:
	src/flash/text/TextField.js
Merge pull request #687 from yurydelendik/fonts-1

Fixes font leading/metrics; hacks to resolve font face