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