Merge pull request #1036 from clebertsuconic/2.3.x

release 2.3.1 commit