Merge back from develop

That thing that I merged like 3 days ago, hooray!