Merge branch 'develop' of https://github.com/saltstack/salt into develop

Conflicts:
	salt/modules/file.py