0.8dev: Integrate change from [trac 12268].


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