Merge remote-tracking branch 'origin/master'

fengxiang

2018-04-25 f74fd7281a4d6b0176692078052a6281eaafcc41

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