Merge topic 'vtk_master_20141104' into pv-master

c3fcd2b3 Merge remote-tracking branch 'pvvtk/pv-master' into HEAD
736e15f2 Merge topic 'stencil-raster-tolerance' into master
51ebea64 Merge topic 'ImageCanvasSource2D-Improvements' into master
a42b7869 ENH: Added function to initialize volume
ab8ae4f1 Merge topic 'wrap_parallel_fix' into master
896b83f8 Fix RenderingParallel when wrapped and fix a compiler warning
69afec01 Merge topic 'fix_bad_merge' into master
e1d90d07 Fix a bad merge
ff981f6a Merge topic 'parallel_fixes' into master
a632e687 Merge topic 'OpenGL2-Texture-ClampBorder' into master
0b64c2e2 ENH: Added support for ClampToBorder (as it was in OpenGL)
3bba750a Merge topic 'silence-warning' into master
b9e849eb Merge topic 'opengles_fixes' into master
f497ed3a Added some ifdef needed for OpenGL ES 20
9b3d5ea3 Merge topic 'edge_vis_cpdm2' into master
893c3c5c Fix edge color with composite polydata mapper 2
...
Merge remote-tracking branch 'pvvtk/pv-master' into HEAD

* pvvtk/pv-master:

Change-Id: Ib51059d44d12c53af14d32825e1fb3fe18f92018