Fixed an iOS deprecation warning with Cordova 3.6.x
Merge remote-tracking branch 'origin/master'