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