COMP: VTK 6 compatibility
Merge remote-tracking branch 'origin/master'