Release RC21 (Part 2)
Merge pull request #1068 from sylus/7.x-1.x

Release RC21 (Part 2)