Version bump to 2.6.0-SNAPSHOT
Merge pull request #1027 from rsvato/master

Version bump to 2.6.0-SNAPSHOT