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