Fix #3789
Merge branch 'develop' of github.com:saltstack/salt into puppet-pillar