Merged, I hope. May be a few conflicts