saltstack/salt — pull request #15496 by basepi (2014-09-03 22:03:46+00:00)
Title: Backport #15409 to 2014.7

Backport #15409 to 2014.7