saltstack/salt — pull request #11309 by basepi (2014-03-17 23:43:25+00:00)
Title: Cherry-pick #11308 to 2014.1

This should only be merged if #11308 is merged.