Merge branch 'release/2.1.4' into develop
DOH.. README.rst?  :shipit:
2.1.4.1
Merge branch 'release/2.1.4.1'