Merge branch 'master' into move_lib_to_sep_dir

Conflicts:
	cmake/modules/NSIS.template.in
	src/CMakeLists.txt
	src/creds/shibboleth/authenticationdialog.cpp
	src/creds/shibboleth/authenticationdialog.h
	src/gui/owncloudgui.cpp
	src/libsync/creds/shibboleth/authenticationdialog.cpp
	src/libsync/creds/shibboleth/authenticationdialog.h
	src/libsync/mirallaccessmanager.cpp
	src/mirall/authenticationdialog.cpp
	src/mirall/authenticationdialog.h

src/gui/folderstatusmodel.cpp

@@ -254,7 +254,7 @@ void FolderStatusDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
       painter->save();
 
       // Sizes-Text
-      QRect octetRect = progressFm.boundingRect( overallString );
+      QRect octetRect = progressFm.boundingRect(QRect(), 0, overallString );
       int progressTextWidth = octetRect.width() + 2;
 
       // Overall Progress Bar.