saltstack/salt — pull request #15258 by basepi (2014-08-25 20:09:14+00:00)
Title: Backport #15070 to 2014.7

Backport #15070 to 2014.7