v5.2.2.1

Please review CHANGELOG.php for details
Merge pull request #1 from tsquez/master

v5.2.2.1