saltstack/salt — pull request #15316 by basepi (2014-08-27 17:13:59+00:00)
Title: Backport #15300 to 2014.1

Backport #15300 to 2014.1