Incorporate unmerged changes for cordova 2.8.0