Merge pull request #1 from gsson/master

Early master delegation on quorum loss
Fix state transition test-case that broke in d768330