Updated copyright headers
Merge branch 'master' into eden