Merge remote-tracking branch 'upstream/master' into intel-extreme

Add an App_wxWidgets icon just so it's there