0.8dev: Part of [1616400]. Refs #795.


git-svn-id: https://svn.apache.org/repos/asf/bloodhound/trunk@1616498 13f79535-47bb-0310-9956-ffa450edef68