Update dependencies.
Merge pull request #1669 from XhmikosR/2.x

Update dependencies.