Added timestamp so Shane will be happy.
Merge branch 'pktTimestamps' into development