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