Fix timestamp
Merge branch 'master' into wp-submission