saltstack/salt — pull request #15241 by basepi (2014-08-25 19:34:38+00:00)
Title: Backport #14552 to 2014.7

Backport #14552 to 2014.7