Merge commit 'refs/changes/15/8015/2' of ssh://korap.ids-mannheim.de:29418/KorAP/Koral into opPROX4Review

Change-Id: I35bc56ff7489c256c26fa5041c25987e3eabf0f4