Merge back from develop

Wait what does this even do, and why do I get the feeling that this will break?