gustafn
committed
on 05 Sep 15
- handle "merged" user state on more places