Merge pull request #32 from KirinDave/master

Cutting v2.5.2-RR
Step one of 2.5.3 update.