Merge pull request #2743 from gmazzo/fix-ci

Fixes CI (with minimal changes)