Kk devel

Fixed up the kk-devel branch for hikari.