The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems.
It is analogous to 98d8e1a160.
98d8e1a160