Merge branch 'bug-11700-OdfRenderWidget'
Conflicts: Plugins/org.mitk.gui.qt.diffusionimaging/src/QmitkODFRenderWidget.cpp