Merge remote-tracking branch 'origin/master'

fengxiang

2018-06-09 906e819de11a4f2a47545aff9fc551abd811adb5

1
distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip