Fix #1336 by adding a master kill switch for inputs.
Merge remote-tracking branch 'origin/master' into issue1336

Conflicts:
	CHANGES.md
Changes per review.
Merge remote-tracking branch 'origin/master' into issue1336

Conflicts:
	CHANGES.md
Merge pull request #1372 from AnalyticalGraphicsInc/issue1336

Fix #1336 by adding a master kill switch for inputs.