Merge pull request #558 from andrerod/dev

Update versions for the release