Merge pull request #1 from xdegaye/master

Fix some last upstream changes that break the build.