Merge back from develop

Hey, looks like we're not the only ones digging a hole in this file