Export Template Update with Caution
Merge pull request #5817 from edx/markhoeber-1138

Export Template Update with Caution