Merge pull request #537 from tobiasd/20180302-zhcn