please check the successful travis-build of this patch. It runs on ubuntu.