handle missing time estimates
Merge branch 'master' into production