Merge topic '15032_fix_settings_dialog'

c49e9c1b BUG #15032: Fixed usability issues with settings dialog.
Merge topic '15076_fix_opacity_mapping_reset'

efe3ac35 BUG #15076: Fix resetting of opacity range.
Merge topic '15078_fix_point_sprite'

4979c43a BUG #15078: Fix update issue with PointSprite plugin.
Merge topic '15090_fix_state_loading_issues'

f815af75 BUG #15090: Fixed state loading + time issue.
Merge topic '15093_fix_stereo_issues'

0c9dfba0 BUG #15093: Fixed issue with stereo rendering.
Merge topic 'include-mpi-paths-as-system'

eb03ba12 mpi: include MPI paths as SYSTEM includes
70f0c1f5 whitespace: add missing newlines at the end of files
Merge topic 'update-rendering-edition'

38622b58 Rendering-Base: add vtkTriangleFilter
Merge topic 'update-vtk-20141030'

b2208efe QtPython: find PythonLibs
52b629cf QtPython: don't quote variables which may be a list
535c1903 cmake: replace PYTHON_INCLUDE_PATH with PYTHON_INCLUDE_DIRS
58dedb20 update vtk
Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I0d03f633aea869bbb3574049999ecd17bf99dde7
Update VTK

Change-Id: Ib7b7e3d84f9ef562093aa31f45154f5ff888b8f0
Merge topic 'vtk_master_20141104' into next

b2b84c74 Update VTK
Added a test for BUG #15048.

Change-Id: Ib2c1c8b34be34f42578780812b5a9bb1b333416a
Merge topic 'test_max' into next

519b6803 Added a test for BUG #15048.
BUG #15100: Increate ColorMapEditor dialog width.

Making default width for the ColorMapEditor dock panel to be large
enough to not need horizontal scroll bars.

Also updating all dock panels that we expect to be docked vertically to
not allow docking on the horizontal dockable regions -- improving
usability.

Change-Id: I0fd17d08e566c471cd87f0f575f3c787f91a6efb
Update test after widget size change.

Change-Id: I6daf54eace03bf2ea80f53fbedb870ed20aeaadb
Merge topic '15100_fix_color_map_editor_size' into next

68a6f38a Update test after widget size change.
c589883e BUG #15100: Increate ColorMapEditor dialog width.
BUG #15060. Fixed issue when using TemporalShiftScale.

The problem was that when the current timesteps changed, we didn't snap
the current time to the new timesteps. That meant that we continued to
show the same old timestep even though the pipeline timesteps changed.
We fix this behavior by ensuring that we snap to a valid timestep when
the timesteps change and the animation is in "snap to timesteps" mode.

Change-Id: Ib6d1c1ca22eedf84cc8e9aa36592ad403d10a172
Merge topic '0015060_fix_temporalshift_issue' into next

4a3f3687 BUG #15060. Fixed issue when using TemporalShiftScale.
BUG #15059: Bring back lost comments about ${TIME}.

Added placeholder text to Chart Title widget to indicate using ${TIME}
for time. Also added the same to the tooltip.

This added a new xml hint "PlaceholderText" to add placeholder text for
pqLineEdit in pqStringVectorPropertyWidget.

Change-Id: I20cae97ecb07c80ed7c44872fea39a876d60bcf9
Merge topic '15059_fix_time_comments' into next

dc7a344d BUG #15059: Bring back lost comments about ${TIME}.