Merge remote-tracking branch 'origin/master' into T24776-selection_refactoring_MatchPoint_plugins
- Conflicts:
- Plugins/org.mitk.gui.qt.matchpoint.algorithm.batch/src/internal/QmitkMatchPointBatchProcessor.h
Signed-off-by: Ralf Floca <r.floca@dkfz-heidelberg.de>