Merge back from develop

Hooray, more of my stuff!