Merge pull request #1915 from Ansuel/upgrade