timeholder.py merged from 1.5.x to its version on master (single file merge)