Merge branch 'master' of https://github.com/CasparCG/Client
Merge branch 'master' of https://github.com/CasparCG/Client
Merge remote-tracking branch 'upstream/master'
Modified to support qt5
Merge remote-tracking branch 'upstream/qt5'