Update Copyright Years
Merge 'upstream/master' into minemovie