Merge tag 'v5.3.15' into dev-5.3

This is the 5.3.15 stable release

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