Merged from Slicer trunk