Manually pull in 33cdd9e760c0
Merge branch '0.16' of github.com:saltstack/salt into 0.16