CSURITemplate 0.2
Merge pull request #3381 from wharris/CSURITemplate-0.2

CSURITemplate 0.2