Merge branch 'feature/incremental-js-build' into feature/upgrade-transforms

Conflicts:
	npm-shrinkwrap.json

Author: benholloway