@mpickering I've switched this over to using git submodules, could you pull in the latest code?