Merge pull request #1554 from ppekrol/2.5

bug fix for RavenDB-2908