saltstack/salt — pull request #15256 by basepi (2014-08-25 20:07:02+00:00)
Title: Backport #15060 to 2014.7

Backport #15060 to 2014.7