Merge fixups: chronological changelog; really remove patch