Merge tag 'v4.17.18' into dev-4.17

This is the 4.17.18 stable release

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