Merge pull request #1610 from uhoreg/reloaded

Commit

7 years ago

Merge pull request #1610 from uhoreg/reloaded document new state resolution algorithm