Merge the t-gnus-6_17-quimby branch.