This should be merged after #719 which has already changed the copyright.