new visibility: tree (not distributed)
Merge branch 'master' into xmpp