saltstack/salt — pull request #15526 by basepi (2014-09-04 19:44:17+00:00)
Title: Forward-port #15378 to 2014.7

Forward-port #15378 to 2014.7