sync w/ kde-testing repo