Merge branch 'master' into pv-master

* master: (439 commits)
  Trivial fixes for API change in OpenGL2 shaders
  Update baselines due to text rendering changes.
  FIX: Bypass testing if OpenGL extensions not supported
  XMLReader: Prevent streams from being closed when they don't exist.
  FIX: Make sure context is present
  vtkInformationDataObjectKey: move to CommonDataModel
  ENH: Volume Mapper benchmark test
  zlib: remove empty if statements
  cmake: fix up some version checks
  FindTBB: fix up typo'd logic
  cmake: remove @var@ expansions
  cmake: remove arguments to else and endfoo commands
  cmake: remove arguments from else and endfoo in zlib
  cmake: remove arguments from else and endfoo in xdmf3
  cmake: remove arguments from else and endfoo in xdmf2
  cmake: remove arguments from else and endfoo in VPIC
  cmake: remove arguments from else and endfoo in verdict
  cmake: remove arguments from else and endfoo in tiff
  cmake: remove arguments from else and endfoo in TclTk
  cmake: remove arguments from else and endfoo in sqlite
  ...

Change-Id: Ib25c67a3bb53c99987a185fc96f5974bec2b084f
Merge branch 'master' into update-vtk

* master: (439 commits)
  Trivial fixes for API change in OpenGL2 shaders
  Update baselines due to text rendering changes.
  FIX: Bypass testing if OpenGL extensions not supported
  XMLReader: Prevent streams from being closed when they don't exist.
  FIX: Make sure context is present
  vtkInformationDataObjectKey: move to CommonDataModel
  ENH: Volume Mapper benchmark test
  zlib: remove empty if statements
  cmake: fix up some version checks
  FindTBB: fix up typo'd logic
  cmake: remove @var@ expansions
  cmake: remove arguments to else and endfoo commands
  cmake: remove arguments from else and endfoo in zlib
  cmake: remove arguments from else and endfoo in xdmf3
  cmake: remove arguments from else and endfoo in xdmf2
  cmake: remove arguments from else and endfoo in VPIC
  cmake: remove arguments from else and endfoo in verdict
  cmake: remove arguments from else and endfoo in tiff
  cmake: remove arguments from else and endfoo in TclTk
  cmake: remove arguments from else and endfoo in sqlite
  ...

Change-Id: I4116b0a7e5eb876a7ba17e3103805b9d1da13021
Merge branch 'update-vtk' into pv-master

Change-Id: I7b5f404685026e65ccb70aa9d5c56fb0f0332505
Merge remote-tracking branch 'pvvtk/pv-master' into HEAD

* pvvtk/pv-master:

Change-Id: I5fd865b96b2a048650615680e791e6dc00d81fd4