Prepping for v2.5.2
Merge pull request #350 from meatballhat/v2.5.2-prep

Prepping for v2.5.2