saltstack/salt — pull request #18368 by basepi (2014-11-21 19:05:55+00:00)
Title: Merge forward from 2014.7 to develop

Merge forward from 2014.7 to develop