Merge tag 'v6.1.51' into dev-6.1

This is the 6.1.51 stable release

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