coerce timestamps so graphs from disparate sources line up
Merge remote-tracking branch 'origin/libratofloor'