saltstack/salt — pull request #18942 by thatch45 (2014-12-12 00:01:45+00:00)
Title: Merge #18932

Merge #18932 with fixes