fix for RavenDB-1395
Merge branch 'New3' of github.com:ayende/ravendb into New3
conflict resolve after merge