fixed font family option for preformatted text
Merge branch 'master' into ice-cream-sandwich