Merge pull request #1 from p2t2/DEV2.5.0

Update to 2.5.0