Merge back from develop

I uh... er, okay man.