SDK Cordova Plugin: Merging master to unstable