Overdue update to moc 2.5.2. If it's reproducible for others as well, I'll
commit it to master.