date metadata
Merge branch 'dev' into ajmcguire