merge_copyrights revision b897c52f865b2fc4e220e2110b874e59c716456b