Merge branch 'master' into 0.21.5
diff --git a/cordova-lib/npm-shrinkwrap.json b/cordova-lib/npm-shrinkwrap.json
index 836207c..ef9179d 100644
--- a/cordova-lib/npm-shrinkwrap.json
+++ b/cordova-lib/npm-shrinkwrap.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-lib",
-  "version": "0.21.3",
+  "version": "0.21.5",
   "dependencies": {
     "bplist-parser": {
       "version": "0.0.5",