saltstack/salt — pull request #17057 by basepi (2014-10-30 23:43:41+00:00)
Title: Merge 2014.7 into develop

Merge 2014.7 into develop