Release 1.6-M7
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Release 1.7.1
Release 1.7.1
Release 1.7.1
Worked on migrating to newer Groovy
Merge Groovy work into develop