Merge pull request #394 from TheBlueMatt/2019-11-broken-build