saltstack/salt — pull request #16796 by rallytime (2014-10-21 21:02:10+00:00)
Title: Backport #16704 to 2014.7

Backport #16704 to 2014.7

Refs #16765