Updated copyright and version.
Merge branch 'master' into 2.0