saltstack/salt — pull request #15259 by basepi (2014-08-25 20:10:13+00:00)
Title: Backport #15073 to 2014.7

Backport #15073 to 2014.7