Add copyright statement to the top of the private class
Pull in changes from master