saltstack/salt — pull request #16328 by basepi (2014-10-02 16:22:00+00:00)
Title: Backport #16325 to 2014.7

Backport #16325 to 2014.7