Merge pull request #826 from katzj/zookeeper