Build #614:   Merge 52e1bdedaad2e7ed8963b96c542c299d94adcfc3 into aa1d525a5f30bf6dee0e6186703a1f578f9... on branch update-copyright over 5 years ago