Merge pull request #3459 from Voyager1/fix-build