Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I7399061247015ed4617260357398eaed1cf3f7bd
Update VTK to origin/release.

Change-Id: Ia5c75db481b21dbf53f17616f97a2f9b53452f25
Merge topic 'update_vtk' into next

30ec64c Update VTK to origin/release.