Merge develop

Do not bump version number, this is just to add copyright dates.