Merge master into next

Change-Id: Ic430b80d0f8c6d988ed1dfd6440626de0d399cb1
Merge topic '0014533-remove-pipeline-tricks' into next

d33b2061 Remove dependencies on little used VTK pipeline features.