saltstack/salt — pull request #14767 by basepi (2014-08-05 22:23:47+00:00)
Title: Backport #14656 to 2014.7

Backport #14656 to 2014.7