saltstack/salt — pull request #18156 by basepi (2014-11-17 21:52:52+00:00)
Title: Merge forward from 2014.7 to develop

Merge forward from 2014.7 to develop