Bug2193
Zit3014
Merge branch 'Bug2193'
Merge branch 'master' of https://github.com/distributor/Distributor.Client