saltstack/salt — pull request #15333 by basepi (2014-08-27 22:10:11+00:00)
Title: Backport #14904 and #14929 to 2014.1

Backport #14904 and #14929 to 2014.1