saltstack/salt — pull request #15261 by basepi (2014-08-25 20:14:40+00:00)
Title: Forward-port #15141 to 2014.7

Forward-port #15141 to 2014.7