Fix suspended scope

:non_suspended should check if suspension is <= NOW, else one could end up in neither group.
Merge pull request #2343 from knutaldrin/patch-1

Fix suspended scope