Update to latest KIF master