saltstack/salt — pull request #16329 by basepi (2014-10-02 16:45:05+00:00)
Title: Backport #16311 to 2014.7

Backport #16311 to 2014.7