Merge back from develop

Going to be a lot of me checking up on this while I do SDL2#...