Pull in changes from omniti-labs/kayak