On 07/03/2016 08:54 PM, Christer Ekholm wrote:
> I have tested some more now, and a simple change from "else if" to
> just "if" does help.
>

Thanks, that fixes part of the remaining bug, but I see another case 
where there's a problem: we need to test the minimum of the two end 
times against "now". I installed the attached further patch into 
'master', which I hope puts this all to rest on 'master'. It is indeed a 
tricky area.