0.8dev: Part of [1560598]. Refs #742.


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