Merge remote-tracking branch 'origin/KDE/4.14'

Conflicts:
	kmail/editor/kmcomposewin.cpp
	korganizer/htmlexportjob.cpp
	messagecomposer/attachment/attachmentcontrollerbase.cpp
	messagecomposer/job/attachmentvcardfromaddressbookjob.cpp

editor/kmcomposewin.cpp

@@ -2317,7 +2317,7 @@ void KMComposeWin::slotExpandGroupResult(KJob *job)
     const QString attachmentName = expandJob->property("groupName").toString();
     const QByteArray mimeType = "text/x-vcard";
     KContacts::VCardConverter converter;
-    const QByteArray groupData = converter.createVCards(expandJob->contacts());
+    const QByteArray groupData = converter.exportVCards(expandJob->contacts(), KContacts::VCardConverter::v3_0);
     if (!groupData.isEmpty()) {
         addAttachment(attachmentName, KMime::Headers::CEbase64, QString(), groupData, mimeType);
     }

kmsystemtray.cpp

@@ -214,7 +214,10 @@ void KMSystemTray::updateCount()
         return;
     }
     if (mShowUnreadMailCount) {
-        const int overlaySize = KIconLoader::SizeSmallMedium;
+        int overlaySize = KIconLoader::SizeSmallMedium;
+        if (!mIcon.availableSizes().isEmpty()) {
+            overlaySize = mIcon.availableSizes().at(0).width();
+        }
 
         const QString countString = QString::number(mCount);
         QFont countFont = QFontDatabase::systemFont(QFontDatabase::GeneralFont);