saltstack/salt — pull request #15295 by basepi (2014-08-26 20:54:00+00:00)
Title: Backport #15119 to 2014.7

Backport #15119 to 2014.7