Merge pull request #14994 from saltstack/bp-14990

Backport #14990 to 2014.7
Merge branch '2014.7' into develop