Merge branch 'RavenDB-1963'