Merge remote-tracking branch 'origin/vendor/LIBEDIT'