Merge branch 'master' into inquiry-space

Fixed merge conflicts in Mocha tests that were edited in the topic branch by manually adding the changes that were made in 002294c3485e73eaac (new convention for calling requirejs in sync form) and 7174625e4b8af4078a (addition of withIsolatedRequireJSAndViewsMocked to speed up 'slow' Mocha tests).

Conflicts:
    test/mocha/common/export-controller-spec.coffee
	test/mocha/md2d/custom-parameters-spec.coffee
	test/mocha/md2d/interactive-filtered-outputs-spec.coffee
	test/mocha/md2d/interactive-outputs-spec.coffee
	test/mocha/md2d/interactive-parameters-spec.coffee
	test/mocha/md2d/output-properties-spec.coffee