Merging v2.1.4 into minor.
Merge pull request #1340 from bitovi/2.1.4-minor

Merging v2.1.4 into minor