saltstack/salt — pull request #16898 by rallytime (2014-10-24 23:00:38+00:00)
Title: Backport #16886 to 2014.7

Backport #16886 to 2014.7