Merge commit 'v2.5.1'

No match.