Merge tag 'v5.7.12' into dev-5.7

This is the 5.7.12 stable release

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