Merge "master" into "psppsheet" to obtain bug fixes from "master".