Changing version to 2.1.4.
Merge branch 'develop'