add support for user-part delimiters in aliases and virtual databases
Merge branch 'master' into portable
allow '+' in username expand nodes
Merge branch 'master' into portable