saltstack/salt — pull request #15246 by basepi (2014-08-25 19:42:32+00:00)
Title: Backport #14861 to 2014.7

Backport #14861 to 2014.7