saltstack/salt — pull request #15247 by basepi (2014-08-25 19:43:53+00:00)
Title: Backport #14882 to 2014.7

Backport #14882 to 2014.7