Merge proposals

Enrico-gueli+kdebug has no merge proposals.