Merge pull request #1468 from clebertsuconic/2.3.x

release commit