Merge pull request #375 from ServiceStack/master

re-sync v3-fixes