Merge branch '14x'

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