Merge branch 'master' into pretty-print

Conflicts:
	bin/traceur.js
	src/runtime/LoaderHooks.js