Cordova: Merging master into unstable