Merge back from develop

Oh. Huh. Whatevs.