Change-Id: I458cbb2168642f226583b406e34596d223c7d5ea Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>