Merge branch 'patch-7' of https://github.com/stevengill/cordova-coho