Merge pull request #319 from ServiceStack/master

re-sync v3-fixes