Updated dependency on attoparser to 1.4.0.RELEASE
Updated copyright header.
Merge branch '2.1-dev' into 2.1-master