Merge pull request #3337 from akoeplinger/fix-alpine