Merge branch 'release/1.24' into develop
updating poms for 1.25-SNAPSHOT development
Merge branch 'develop'
blah