Merge changes on t-gnus-6_15-quimby.