fix for modernizr.js
Merge branch 'develop' into feature/child-events