Update version number
Merge branch 'release/1.6.14' into develop