saltstack/salt — pull request #17314 by basepi (2014-11-10 21:09:36+00:00)
Title: Merge forward from 2014.7 to develop

Merge forward from 2014.7 to develop