Merge tag 'v5.1.16' into dev-5.1

This is the 5.1.16 stable release

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