Fix http://issues.hibernatingrhinos.com/issue/RavenDB-2321
Merge branch '2.5' of github.com:ayende/ravendb into 2.5