Merge branch 'bug-11847-pv-freeze'
Conflicts: Modules/DiffusionImaging/Algorithms/itkExtractChannelFromRgbaImageFilter.cpp