Version bump to 2.6-M3 for release.
Version bump to 2.6-SNAPSHOT for forward development.
Merge remote-tracking branch 'origin/master' into lift_30