saltstack/salt — pull request #15297 by basepi (2014-08-26 21:06:22+00:00)
Title: Backport #11700 to 2014.1

Backport #11700 to 2014.1