Merge branch '4000-rerun-pipeline-changed-template'
authorTim Pierce <twp@curoverse.com>
Wed, 1 Oct 2014 18:59:30 +0000 (14:59 -0400)
committerTim Pierce <twp@curoverse.com>
Wed, 1 Oct 2014 19:11:12 +0000 (15:11 -0400)
Closes #4000.


Trivial merge