Merge pull request #1382 from clebertsuconic/2.3.x

release commit