Add LocalOne consistency
Merge pull request #212 from Zariel/local-one

Add LocalOne consistency
Merge remote-tracking branch 'upstream/master' into rebind