saltstack/salt — pull request #14687 by garethgreenaway (2014-08-01 18:38:03+00:00)
Title: Backporting #14534 to 2014.1

Backporting #14534 to 2014.1