Merge pull request #24 from ServiceStack/master

re-sync v3-fixes