ENH: Merged recent changes contributed by Slicer4 developers into Slicer3 and BRAINS3.
git-svn-id: http://svn.slicer.org/Slicer4/trunk@15625 3bd1e089-480b-0410-8dfb-8563597acbee
git-svn-id: http://svn.slicer.org/Slicer4/trunk@15625 3bd1e089-480b-0410-8dfb-8563597acbee