Prepare v2.1.7 release.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.1' into 2.2
Prepare v2.2.5 release.

Signed-off-by: crynobone <crynobone@gmail.com>