Wip 	Merge remote-tracking branch 'upstream/master' into OXCHD

getting up to date with base code