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

Backport #15206 to 2014.7