Merge topic 'update-vtk-20140820' into pv-master

13abe244 Merge topic 'mpi4py-osx' into master
9da49578 Merge topic 'find-mesa-improvements' into master
deae524a Allow location of OSMesa install to be specified
fa04ced9 Update to modern CMake style
6b1acefa Merge topic 'piston-bugfix' into master
adac1b7b Merge topic 'borland-cleanup' into master
3fdc0120 Merge topic 'shader_precision' into master
7e75575c clean up some shader code and classes
0fe880d6 mpi4py: use old code with Python 2.6 as well
1548754b Merge topic 'java-android' into master
ea7fddf9 Merge remote-tracking branch 'pvvtk/pv-master' into HEAD
b318abe4 Merge topic 'fix_selection_frame_line_style' into master
f4d52287 Merge topic 'prevent-anti-aliasing-in-some-tests' into master
45efae2a Fixed issue with selection frame line style.
c3e52096 Testing: Call SetMultiSamples(0) from tests
b1017ada more reasonable first cut at java android
...
Merge remote-tracking branch 'pvvtk/pv-master' into HEAD

* pvvtk/pv-master:

Change-Id: I588dbb9712e18210aa035584a2327892c4ccab4b
removed unused includes

Change-Id: If9f0eba8b2c0c1047f09c4dc612bcdb25319b005
Merge topic 'opengl2_glyph_fix' into master

c0b5f664 removed unused includes
fix some warnings

Change-Id: Ib8ee7e7dc4b9d29621b3906571c5341ece594676
Merge topic 'some_warning_fixes' into master

e1ef59ea fix some warnings