saltstack/salt — pull request #15154 by thatch45 (2014-08-21 20:11:53+00:00)
Title: Merge #13716

@terminalmage, please cross check this, I have to resolve a merge conflict