saltstack/salt — pull request #14994 by basepi (2014-08-14 19:14:00+00:00)
Title: Backport #14990 to 2014.7

Backport #14990 to 2014.7