saltstack/salt — pull request #15497 by basepi (2014-09-03 22:06:18+00:00)
Title: Backport #15410 to 2014.7

Backport #15410 to 2014.7