saltstack/salt — pull request #16042 by basepi (2014-09-22 20:52:09+00:00)
Title: Misc Backports

Backport #15917 to 2014.7
Backport ca767a5 to 2014.7