合并最新上游 8-14-stable 分支

Tao Wang requested to merge twang2218/gitlab:8-14-zh into 8-14-0-rc1-zh Nov 20, 2016