I just uploaded 3.3+20.604758e7-6.1 to the archive to fix RC bug 957359. My changes are recorded in this MR.