saltstack/salt — pull request #15245 by basepi (2014-08-25 19:41:22+00:00)
Title: Backport #14851 to 2014.7

Backport #14851 to 2014.7