Merged by hand, all files should be fine