Merge back from develop

Ooh, yah!