Update to 20180522

Changes: https://git.tartarus.org/?p=simon/agedu.git;a=shortlog