Our dalli fork, rebased off upstream/master