saltstack/salt — pull request #18242 by basepi (2014-11-18 23:49:15+00:00)
Title: Merge forward from 2014.7 to develop

Merge forward from 2014.7 to develop