saltstack/salt — pull request #15243 by basepi (2014-08-25 19:38:25+00:00)
Title: Backport #14839 to 2014.7

Backport #14839 to 2014.7