Merge tag 'v4.18.20' into dev-4.18

This is the 4.18.20 stable release

Signed-off-by: Joel Stanley <joel@jms.id.au>