Commit 6f1ff72927918e45ed6e36810f96d74ef35b6893

Authored by xingyu
2 parents d2805b1d b0b72523

Merge remote-tracking branch 'origin/master' into 1.X-dev