saltstack/salt — pull request #15318 by basepi (2014-08-27 17:14:56+00:00)
Title: Backport #15313 to 2014.7

Backport #15313 to 2014.7