working on jeremy's issue
Merge branch 'competing' of https://github.com/EventStore/EventStore into competing