saltstack/salt — pull request #15135 by basepi (2014-08-20 22:35:13+00:00)
Title: Forward-port #15078 to 2014.7

Forward-port #15078 to 2014.7