Fresh fix commit for saltstack/salt repo issue #11096
Merge pull request #11104 from sandbender/mydevelop

Fresh fix commit for saltstack/salt repo issue #11096