Merge remote-tracking branch 'origin/KDE/4.13'
Conflicts: storageservicemanager/storageservicemanager.desktop