Merge tag '2.5.0' into develop

2.5.0
Add aditional ast cross python version compatibility support
Bump version to 2.5.1
Merge branch 'release/2.5.1'