Updated version number
Merge branch 'release/1.0.17' into develop