merging in from trunk before swapping out trunk

git-svn-id: https://svn.apache.org/repos/asf/directory/studio/branches/m1@1072793 13f79535-47bb-0310-9956-ffa450edef68