Merge remote-tracking branch 'origin/master'

fengxiang

2018-08-17 2d0b1b3da347f201cfe608e426fb2b7fdb9629a7

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