saltstack/salt — pull request #16229 by rallytime (2014-09-29 18:11:44+00:00)
Title: Cherry-pick #16035 to 2014.1

Cherry-pick #16035 to 2014.1