saltstack/salt — pull request #19192 by basepi (2014-12-22 20:34:18+00:00)
Title: Merge forward from 2014.7 to develop

Merge forward from 2014.7 to develop