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