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