bump version number
Merge branch 'release/2.1.4' into develop