Update to v2014-0925
Merge branch 'master' into fonts