Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I4aad2a56c9e74fd8fa5fcef56767c63f860addfa
Update VTK.

Change-Id: I280da1b0dcffc5ba7ca30511972ccd9cb14ed806
Merge topic 'vtk_02_20_2014' into next

d88694d4 Update VTK.