Fixes #149

Patch deadlock in threads causing an increase in CPU load.
Merge branch 'issue-149' into develop
[maven-release-plugin] prepare release 2.0.0-beta4-pre26