Merge pull request #2331 from ben-clayton/fix-chromium

Attempt to fix chromium builds