Guh. Typoed earlier and forgot to remove.
Merge pull request #14929 from cachedout/fix_14099

Guh. Typoed earlier and forgot to remove.
Merge branch '2014.7' into develop

Conflicts:
	salt/minion.py