Merge branch 'master' into feature/UIMA-5810-Add-contribution-guidelines-and-PR-template