Updating project version to 3.0.0-SNAPSHOT
Merge remote-tracking branch 'upstream/master'