Fixes #972. Implements Best_Match policy.
Fixes #975
Merge pull request #977 from emmanuel-keller/1.6

1.6