Merge branch '3.4.x' into cordova-3.4.x