Merge pull request #80 from github/Apply-polyfills-only-when-unsupported

Merge pull request #80 from github/Apply-polyfills-only-when-unsupported #294