Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I2106f69963a4151d9cc97f2fa86f4c7937d26053
Merge topic 'fix_pvpython_cmakescript' into next

8bd0620 Fix paraview's python modules.
Merge topic 'fix-selection-test' into next

db520d5 Disable SelectionLabels test if Python is disabled