saltstack/salt — pull request #15488 by basepi (2014-09-03 21:14:58+00:00)
Title: Backport #14772 to 2014.7

Backport #14772 to 2014.7