Merge master back into bugs

Not sure what the normal process is for this kind of thing.