saltstack/salt — pull request #15255 by basepi (2014-08-25 20:05:32+00:00)
Title: Backport #15045 to 2014.7

Backport #15045 to 2014.7