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