Merge remote-tracking branch 'origin/master'

fengxiang

2018-05-17 9e248232763446e3b0d2b0541ee55e61a9df74b8

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