RavenDB-2842 for 2.5
Merge pull request #1506 from ppekrol/2.5

RavenDB-2842 for 2.5