saltstack/salt — pull request #15249 by basepi (2014-08-25 19:50:18+00:00)
Title: Backport #14913 to 2014.7

Backport #14913 to 2014.7