Merge in libmackerel 1.1