Compilation of changes in commit fd316c8

Including changes to copyright notices it seems!