RavenDB-951

Changes related to discussion [here](http://issues.hibernatingrhinos.com/issue/RavenDB-951)