concurrency issue fixed

Merged Piotr Gawron requested to merge 1333-concurrency-issue into devel_15.0.x

Merge request reports