Resynchronise against upstream 71f683ad53e11c1f0cbc5c250d29647ad5ea0bf3