Bring the sources up to date with kumquat (1/3)