Conflicts: examples/parametertree.py pyqtgraph/Qt.py pyqtgraph/graphicsItems/FillBetweenItem.py pyqtgraph/graphicsItems/InfiniteLine.py pyqtgraph/imageview/ImageView.py