saltstack/salt — pull request #15494 by basepi (2014-09-03 22:02:19+00:00)
Title: Backport #15340 to 2014.7

Backport #15340 to 2014.7