Merged changes from fxos_3.0.x branch
Merge branch 'master' of https://github.com/rixrix/cordova-firefoxos-patch