Merge branch 'bug-11699-OdfColorCoding'
Conflicts: Modules/DiffusionImaging/Rendering/mitkOdfVtkMapper2D.txx