Merge back from develop

/me checks to see if any of his games even use this