BUG 2154
Merge branch 'bugfix' of https://github.com/distributor/Distributor.Client into bugfix