saltstack/salt — pull request #16908 by rallytime (2014-10-25 14:57:39+00:00)
Title: Merge forward

Merge 2014.7 into develop