#2971: merged changesets r16356:16565 from trunk/HeuristicLab.Data.Views to branch/HeuristicLab.Data.Views