Merge branch 'master' into inquiry-space

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