saltstack/salt — pull request #15485 by basepi (2014-09-03 21:03:45+00:00)
Title: Backport #14701 to 2014.7

Backport #14701 to 2014.7