saltstack/salt — pull request #15493 by basepi (2014-09-03 22:01:25+00:00)
Title: Backport #15272 to 2014.7

Backport #15272 to 2014.7