Merge branch '2.1'

diff --cc src/gui/selectivesyncdialog.cpp
Simple merge

diff --cc src/libsync/connectionvalidator.cpp
Simple merge

diff --cc src/libsync/networkjobs.cpp
Simple merge