0.8dev: Part of r1567417. Refs #754.


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