How long has that been in there?
Merge branch 'develop' of github.com:saltstack/salt into develop

Conflicts:
	salt/cloud/__init__.py
Merge pull request #15188 from thatch45/develop

Cleaning