no longer prepend uid in local Received line
Merge branch 'master' into portable