Change-Id: Iaf84cccf864b3975e6f6fe282a97fb5ea70e7a93 Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>