Fixed typo in comment.
Merge branch 'sam_timestamps_with_a_vengeance' into sam_2134_base