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