Backporting RavenDB-984
Merge branch 'master' of github.com:ayende/ravendb