Fixes a license header
Merge branch '2.1-maint'