saltstack/salt — pull request #16327 by basepi (2014-10-02 16:20:53+00:00)
Title: Backport #16322 to 2014.7

Backport #16322 to 2014.7