saltstack/salt — pull request #16337 by basepi (2014-10-02 21:19:03+00:00)
Title: Merge forward from 2014.7 to develop

Merge forward from 2014.7 to develop