Merged from trunk.


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