Will the Andrew's patch be included in the git tree?

Yes. I have been hesitant to check into GIT, changes that are really only configuration changes because I do not know if it is bothersome for you to have to do rebuilds automatically when GIT changes when there is no actual code change. But I will check in what I have today.