saltstack/salt — pull request #18732 by basepi (2014-12-04 18:11:38+00:00)
Title: Merge forward from 2014.7 to develop

Merge forward from 2014.7 to develop