saltstack/salt — pull request #15486 by basepi (2014-09-03 21:08:08+00:00)
Title: Backport #14732 to 2014.7

Backport #14732 to 2014.7