Update to 20180918

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