Merged from "branches/vim7.1".