Apply post-1.18.4 fixes, bump version to 1.18.5

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
6 files changed