saltstack/salt — pull request #15315 by basepi (2014-08-27 17:08:31+00:00)
Title: Backport #15089 to 2014.7

Backport #15089 to 2014.7