Merge conflicts

Today is a day of chaotic little patches that keep breaking master. Sorry about this.