saltstack/salt — pull request #14803 by basepi (2014-08-06 21:04:30+00:00)
Title: Backport #14774 to 2014.7

Backport #14774 to 2014.7