#1772: Merged changes from trunk, rigged the TournamentSelector to track clones, improved tracking code.