remove our change to LK subdirectory before updating
Merge remote-tracking branch 'remotes/origin/master' into tim/issue12