saltstack/salt — pull request #14769 by basepi (2014-08-05 22:32:59+00:00)
Title: Backport #14715 to 2014.7

Backport #14715 to 2014.7