[Update] CSURITemplate (0.3)
Merge pull request #3536 from wharris/CSURITemplate-0.3

[Update] CSURITemplate (0.3)