Merge pull request #1448 from clebertsuconic/master

Fixes before final release