Merge topic 'composite-data-display-attributes' into pv-master

2b0dd1d Merge topic 'sanitize-null' into master
014c51a Fixed use of null object.
511e1f8 Merge topic 'jpeg-setjmp-warning' into master
70c4354 COMP: Fix the vtkJPEGReader setjmp clobber warning.
274cb5e Merge topic 'test-projected-hexahedra-size' into master
2fc4a23 Merge topic 'KdTree_roundoff' into master
8710fd1 Merge topic 'flowpath_filters_check_arrays' into master
79feb9d Reduce TestProjectedHexahedra window size to 500x500.
a7d62db Merge topic 'reduce-test-checkboard-memory-usage' into master
1e993fc Merge topic 'reduce-tcl_test-checkboard-memory-usage' into master
c250dad COMP: Reduce memory usage for TestCheckerboard
96ae86c Reduce memory usage for TestCheckerboard
653b207 Merge topic 'vtkMultiProcessStream_bad_size' into master
353a5b3 Merge topic 'PLYReader_Leak' into master
eab902a Adding in warning if the input vtkPointData structures is different.
af3b3fa Merge topic 'composite-data-display-attributes' into master
...
Merge topic 'update_vtk_master' into pv-master

83c35ed Merge topic 'catalyst_2.0' into master
afd45fd Merge topic 'nearest-power-of-two' into master
499500e Merge topic 'vtkmath-cleanup' into master
f8bea42 Merge topic 'carbon-fix' into master
4bab6f8 Merge topic 'cppcheck-leaks' into master
067c578 ENH: More efficient Ceil() and Floor() with tests.
1486517 ENH: Add math function for computing log2 on integers.
93f3579 ENH: Add math function for nearest power of two.
2297e5d Fixed Carbon build error due to modularization changes.
02d783e Fix Carbon build with newer Xcodes
caf4fca Added #error for Carbon + OS X 10.7 SDK
e837c8f Merge topic 'ensight-sign-warn' into master
41d142e COMP: Fix compare sign warning in Ensight6BinaryReader.
3598500 Removed special case for gcc 3 on OS X
5357c3d Use vtkMath::IsNan unconditionally instead of isnan()
7fe84db Removed unused VTK_SIGN macro
...
Merge remote-tracking branch 'pvvtk/pv-master' into HEAD

* pvvtk/pv-master:

Change-Id: I40c26110f1f8b57edb954c12e1ee2688b9d57b3f