#1997: Merged trunk changes into data analysis island algorithms branch and fixed bugs in the evaluators.