Bugfix in r-tree search.
Merge remote-tracking branch 'origin/master'