Merge the latest version from vimscript #1440.