saltstack/salt — pull request #16894 by rallytime (2014-10-24 22:32:50+00:00)
Title: Backport #16815 to 2014.7

Backport #16815 to 2014.7