Merged commits to  schmunk42 / gii-template-collection