Merge branch 'develop' of http://github.com/saltstack/salt into develop
Merge branch 'issue-8707' into develop
Merge branch 'issue-8343' into develop