Update dependencies (preparing for RC21).
Merge pull request #1063 from sylus/7.x-1.x

Update dependencies (preparing for RC21).