Merge branch 'master' of https://github.com/wxWidgets/wxWidgets into aui-dynamic-notebook

Conflicts:
	src/aui/auibook.cpp