KAZOO-2461
Merge pull request #338 from onnet/KAZOO-2461

KAZOO-2461