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