Update latest snapshot build (4.1-SNAPSHOT)
Merge remote-tracking branch 'upstream/master'