Merge pull request #2328 from mspacek/qtapi

Fix PySide compatibility
Conflicts:
	lib/matplotlib/backends/qt4_editor/formlayout.py