saltstack/salt — pull request #18999 by rallytime (2014-12-15 19:43:41+00:00)
Title: Backport #18442 and #18871 to 2014.1

Backport #18442 and #18871 to 2014.1