Use TypeError shim in tests
Merge branch 'master' into gh-pages
update bundle