Merge branch 'maint' into java-work * maint: tests: list "forgotten" test script in TESTS ylwrap: fix unusual indentation whitespace