Merge branch 'master' of https://github.com/krzyc/Client into qt5
Merge branch 'master' into qt5
Merge branch 'master' into qt5
Merge branch 'master' into qt5
Merge remote-tracking branch 'upstream/qt5'