Merge branch '3.7.x' of https://git-wip-us.apache.org/repos/asf/cordova-firefoxos into 3.7.x