Bumped version for release of 2.1.4
Merge branch 'release/2.1.4' into develop
Bumped version for development after release.