Forgot these two copyright notices
Merge branch 'master' into #364