Prepare for a v2.5.2 release.
Merge pull request #3117 from jekyll/release-2-5-2