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