Make stub timestamps consistent and add commentary
Merge pull request #668 from rjc123/master

Make stub timestamps consistent and add commentary