Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: Ibb6b699b997bfd1b068d4153385cdf998c27d035
Update to lastest VTK master

Change-Id: I4d6265a99748c30146fc9fc9f73b65351e27ebd2
Merge topic 'update_vtk_master' into next

3c7a0cd Update to lastest VTK master