bump to 3.1.17beta1
Fix minor syntax error
Bump to 3.1.17
Merge branch 'release-3.1.17' into development