saltstack/salt — pull request #19096 by basepi (2014-12-18 17:32:59+00:00)
Title: Merge forward from 2014.7 to develop

Merge forward from 2014.7 to develop