Merge js-module-manager branch changes back into master