Merge branch 'RavenDB-1894'