Merge pull request #831 from ServiceStack/master

re-sync v3-fixes