Fixed a bug where since and until didn't always exist
Merging upstream
Merged with upstream