Merge tag 'v6.5.11' into dev-6.5

This is the 6.5.11 stable release

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