Thanks to Andrew Delgleish for updating this to 6.2 patches submitted upstream.
misc pieces from art@, pval@, and myself