Merge pull request #3019 from schani/fix-major-pinning