Applied mvern's patch to source tree for temporary fixes. More investigation necessary, but should keep everyone up and running.