Merge topic '14539-can-crash'

5b2444bd Update VTK.
a4c65dfb User can now easily override paraview's rpath behavior.
Merge topic '15073_fix_ResetCamera'

be448fba Removed unneeded ResetCamera property from RenderView proxy
Merge topic '6657_add_outside_range_colors'

282a926d Added test for out-of-range colors
d8123c31 Exposed out-of-range colors in color map editor
Merge topic 'KW00001499_ColorByFieldData'

d45bdd3b Update the VTK objects for the LUT proxy
b68df73b Bumped VTK version to get new scalar mapping features
c1602b5f Added test for coloring by vtkStringArray in cell data
145d87c5 Configure transfer function for vtkStringArrays
52a142a9 Set field data tuple by which to color
b1033ec8 Added missing header needed due to recent changes in VTK
a081baf9 Made it possible to color by field data
b3269745 Made it possible to get prominent values from field data
c92d425b Enable setting of field association to none (field data)
796ae6eb Added FIELD as valid association
2e21207d Expose the field data arrays in the display color selector
Merge topic 'add_cgns_plugin_test'

8ec1f86d Add simple testing to CGNS plugin
Merge topic 'camera-9503'

c4984ef9 BUG: Adjust Camera / Elevation button printed warning.
Merge topic 'cfapi-null-logic'

9c869998 revert branch
08491158 vtkPVFileInformation: use NewHandle for AliasHandle alloc
27bb71f0 vtkPVFileInformation: more NULL checking on Apple
Merge topic 'exodus-15127'

528499cb Move VTK: Rename data_index to mode_shape in Exodus reader.
c2fa5379 Add documentation about mode_shape to the Exodus reader.
Merge topic 'fix-dashboard-warning'

354c800c Fixed conflict with new Python wrapping
d10b8807 Fix signed-unsigned comparision warning from dashboard
214c8b1c Remove dead code
Merge topic 'h5part-15215'

af7242ce BUG: If there is no data, the extents array is NULL which causes a segfault.
Merge topic 'mangle-pvbatch-test-names'

4d65c068 testing: add mangling to pvbatch tests
Merge topic 'opengl2_updates'

eb83d147 Some fixes and updates for OpenGL2
Merge topic 'pvweb-support-multiple-data-directories'

1f382b19 Allow to specify multiple directories which should be browsable.
Merge topic 'revert-cfapi-deprecation-fixes'

fbef8ffb Revert "vtkPVFileInformation: update to new APIs"
309d4616 Revert "vtkPVFileInformation: CFRelease doesn't handle NULL"
973128f6 Revert "vtkPVFileInformation: remove shadowing variables"
48d9eaa3 catalyst: update the rendering edition
Merge topic 'update-catalyst-20141215'

e0701e7b catalyst: update the rendering edition
Merge topic 'webvisualizer-add-tooltips'

a4598022 Added tooltips for main toolbar and proxy editor toolbar buttons.
Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I65a2bade3e4f3d898691e2bd4207c079a519b822
Remove obsolete class pqActiveServer.

Change-Id: Ieb9aa30108fa379658c23623beb1c07ca07d8a5f
BUG #15224: Fix documentation for settings (LODResolution).

Change-Id: I19c4feb0dbc1f23ee373905c3bb354769f88a4c3
Fix documentation.

Minor cleanups to header documentation.

Change-Id: I0547799f5526a0109ba53be73380985f4977f4be