Merge branch 'develop' into 13x

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