[ ] We should write (a) test(s) for this "rare" occurring bug. If we or upstream make a mistake @SqrtMinusOne very likely is going to create another PR to fix it again :-D.
[ ] There are 3 places where org-extend-today-until is used, a re-factoring might be the better solution in the long run
Related to #428