Merge pull request #319 from ServiceStack/master

re-sync v3-fixes
Merge pull request #320 from ServiceStack/v3-fixes

Merge pull request #319 from ServiceStack/master