Update from Apache Cordova 2.7.0