Merge change I7d761ffa into eclair

* changes:
  Fix best match resource selection when there's only one match.