Fixed #368.
Fixed kazoo-2536.
Merge branch 'KAZOO-2536'
Merge branch 'master' of https://github.com/2600hz/kazoo