- wxPython Phoenix
Merge remote-tracking branch 'remotes/origin/Branch_v1.2.0' into v1.2.x

Conflicts:
	examples/user_interfaces/embedding_in_wx5.py
	lib/matplotlib/backends/backend_wx.py