Version bump.
Merge branch 'refs/heads/version2'
Version bump to 2.1.4.