Synchronized with the source at 51e8d42ee8d9f29d01db0ae24b8ddb07496e5d13.