saltstack/salt — pull request #14764 by basepi (2014-08-05 22:13:31+00:00)
Title: Backport #14607 to 2014.7

Backport #14607 to 2014.7