Merge pull request #1580 from clebertsuconic/2.3.x

release commit