fixing merge
Merge branch '2.5' of github.com:ayende/ravendb into 2.5