Merge pull request #813 from billhollings/master

Update copyright to 2020.