Update dependencies, minor fixes
Drop unsupported versions
Merge pull request #3529 from gpinigin/master

Update dependencies, minor fixes