Merge changes from libvmod-example