saltstack/salt — pull request #15244 by basepi (2014-08-25 19:39:38+00:00)
Title: Backport #14845 to 2014.7

Backport #14845 to 2014.7