Bumped version to 2.6.0-SNAPSHOT
Merge