Merge branch 'vendor/LIBEDIT'