Update copyright attribution and merge in latest development version.