saltstack/salt — pull request #12384 by fivethreeo (2014-04-29 21:36:53+00:00)
Title: first shot at fixing #12147

Not complete, need some help here.