shared file update from distribute.groovy
Merge remote-tracking branch 'upstream/master'