The last merge from master into closure-size obliterated all my closure-size fixes for KDE 5! Luckily, I had them backed-up in another branch.