Backport CordovaBridge from 4.0.x -> master
Merge branch 'master' into 4.0.x (backport of CordovaBridge)