saltstack/salt — pull request #15296 by basepi (2014-08-26 20:56:57+00:00)
Title: Backport #15276 to 2014.7

Backport #15276 to 2014.7