Updated copyright
Merge branch 'master' into continue-callback