merging in to milestones from trunk

git-svn-id: https://svn.apache.org/repos/asf/directory/shared/branches/milestones@1079425 13f79535-47bb-0310-9956-ffa450edef68