Pushing end-of-class work for 3.4.13
take2