saltstack/salt — pull request #15254 by basepi (2014-08-25 20:04:19+00:00)
Title: Backport #15030 to 2014.7

Backport #15030 to 2014.7