Merge Hooke and BE branches of update-copyright.