Rebased against master, fix for travis failures