merging in from trunks

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