possible fix for https://github.com/saltstack/salt/issues/5567
possible fix for https://github.com/saltstack/salt/issues/5567
Merge branch 'develop' of git://github.com/foxx/salt into foxx-develop

Conflicts:
	salt/utils/timed_subprocess.py