Updated copyright header.
Merge branch '2.1-dev' into 2.1-master