Update pom to 2.9-SNAPSHOT for next release
Merge remote-tracking branch 'upstream/master'