Fix class template generation method
Checking in changes prior to tagging of version 1.11.11.