Merge from trunk; up to 2012-12-09T01:04:43Z!rgm@gnu.org.