Merge branch 'add_override' into 'master'
Mark override members as such
See merge request kde/kpmcore!1