saltstack/salt — pull request #16601 by rallytime (2014-10-13 21:27:58+00:00)
Title: Backport #16591 to 2014.7

Backport #16591 to 2014.7