Merge remote-tracking branch 'origin/2.3'

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

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

diff --cc src/libsync/account.h
Simple merge

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

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

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