saltstack/salt — pull request #14492 by thatch45 (2014-07-25 16:33:36+00:00)
Title: Merge PR #14473 with fixed conflicts

Giving this a shot, hopefully it will still show #14473 as merged automatically