saltstack/salt — pull request #11467 by terminalmage (2014-03-23 20:57:18+00:00)
Title: Override __outputter__ when functions trigger exceptions (2014.1 branch)

This is #11464, cherrypicked for 2014.1.