saltstack/salt — pull request #15500 by basepi (2014-09-03 22:12:58+00:00)
Title: Backport #15466 to 2014.7

Backport #15466 to 2014.7