Merge tag 'v5.15.80' into dev-5.15

This is the 5.15.80 stable release

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