Merge pull request #375 from ServiceStack/master

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

Merge pull request #375 from ServiceStack/master