D12160: Rebase onto fresh master

[Nathaniel Graham]

ngraham added a comment.


  Join me in #plasma <https://phabricator.kde.org/tag/plasma/> and we'll work 
this out.

REPOSITORY
  R241 KIO

REVISION DETAIL
  https://phabricator.kde.org/D12160

To: sharvey
Cc: ngraham, #frameworks, michaelh, bruns