saltstack/salt — pull request #15251 by basepi (2014-08-25 20:00:37+00:00)
Title: Backport #15029 to 2014.7

Backport #15029 to 2014.7