Rebase from apache/master

Also updated VERSION and applied the latest cordova-js