saltstack/salt — pull request #14800 by basepi (2014-08-06 17:57:39+00:00)
Title: Backport #14773 to 2014.7

Backport #14773 to 2014.7