Merge tag 'v6.0.19' into dev-6.0

This is the 6.0.19 stable release

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