saltstack/salt — pull request #15484 by basepi (2014-09-03 20:37:56+00:00)
Title: Backport #14601 to 2014.7

Backport #14601 to 2014.7