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