Merge branch 'master' into upload-timestamps