Build #1341:   Merge branch 'master' into mandarin-support on branch mandarin-support over 7 years ago