saltstack/salt — pull request #15262 by basepi (2014-08-25 20:16:17+00:00)
Title: Backport #15165 to 2014.7

Backport #15165 to 2014.7