ServiceStack/ServiceStack — pull request #941 by voloda (2014-09-11 19:37:10+00:00)
Title: Merge fix based on #924 discussions

This is a re-fix based on suggested master changes according to discussion at #924.