Merge branch 'release/2.1.3' into develop
Fixed a race condition in BytesRefUtils
Merge branch 'release/2.1.4'