saltstack/salt — pull request #15248 by basepi (2014-08-25 19:45:47+00:00)
Title: Backport #14887 to 2014.7

Backport #14887 to 2014.7