saltstack/salt — pull request #15263 by basepi (2014-08-25 20:18:26+00:00)
Title: Backport #15179 to 2014.7

Backport #15179 to 2014.7