2.6.0rc1
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cordova-js
Fixing merge conflicts from not updating VERSION
Incrementing version
Merge branch '2.7.x' of https://git-wip-us.apache.org/repos/asf/cordova-js into 2.7.x
Prep for 2.7.0 tagging, please don't let this be retagged