Build #21:   Update test code and default comparator result type on branch master over 6 years ago