GIT master does not currently compile