Strange: In the trunk it’s still ‘Big huge 2.8 merge. Some things are broken. Only for the brave.’ on lots of files.