Imported Upstream version 2014-08-03
Imported Upstream version 2014-08-03 for CJK fonts