Remove build config from master until it's working
Merge remote-tracking branch 'origin/master' into build-config
Revert "Remove build config from master until it's working"

This reverts commit 42bdefe054e0620373cc942f788b71680572a7ee.