saltstack/salt — pull request #16950 by Lacrymology (2014-10-28 06:08:10+00:00)
Title: backport regression fix from 2014.7

cherry-pick of 004f940

fixes I regression I introduced in e75f474