Merge branch 'master' into i18n

This commit is contained in:
Hongxia Zhong 2016-05-06 23:41:58 -07:00
commit f912faec3f