Reviewed-by: martin, psandoz
Co-authored-by: Doug Lea <dl@cs.oswego.edu> Reviewed-by: martin, dholmes