Merge remote-tracking branch 'termim/master' into termim-fixes
ArrowItem: setStyle now combines new options with previously-set options.
AxisItem: fix minor exceptions
cleanups
Merge branch 'termim-fixes' into develop
Bugfixes:
 - isosurface works for arrays with shapes > 255
 - Fixed ImageItem exception building histogram when image has only one value
 - Fixed MeshData exception caused when vertexes have no matching faces
 - Fixed GLViewWidget exception handler
Wrap setLimits in PlotItem and PlotWidget
Merge branch 'viewbox_limits' into develop
Adds ViewBox.setLimits method

Conflicts:
	examples/SimplePlot.py
Merge branch 'develop' into dev

Conflicts:
	examples/SimplePlot.py