Merge in commits

I probably should have finished and merged stream-editdata first, but oh well.