Merge pull request #181 from ServiceStack/master

re-sync v3-fixes