Merge branch '14x'

Change-Id: I08c8713616fadc848939480fb3e37c79e9343735
Signed-off-by: Johannes Faltermeier <jfaltermeier@eclipsesource.com>