Merge pull request #1 from ServiceStack/master

Update from master