saltstack/salt — pull request #16903 by techhat (2014-10-25 03:02:12+00:00)
Title: Backport #16886 to 2014.7

Replaces #16898.

CC @thatch45 and @rallytime.