Xracer/OXCHD — pull request #20 by Xracer (2014-01-16 18:02:55+00:00)
Title: Wip 	Merge remote-tracking branch 'upstream/master' into OXCHD

getting up to date with base code