Migrated polyfill to public since it doesn't work with asset pipeline
Merge branch 'master' into release