Merged changes from trunk to data analysis exploration branch and added fractional distance metric evaluator. #1142