saltstack/salt — pull request #14804 by basepi (2014-08-06 21:34:23+00:00)
Title: Backport #14694 to 2014.7

Backport #14694 to 2014.7