saltstack/salt — pull request #15498 by basepi (2014-09-03 22:11:04+00:00)
Title: Backport #15464 to 2014.7

Backport #15464 to 2014.7