Catch TypeError: a float is required on datetime.fromtimestamp
Merge remote-tracking branch 'refs/remotes/itofzo/fix_findPropers_omgwtfnzbs' into Conglomeration-external
Merge branch 'refs/heads/Conglomeration-external' into devProduction