Merge pull request #1 from wxWidgets/master

sync