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