Merge branch '7159-keepexercise' refs #7159
authorTom Clegg <tom@curoverse.com>
Thu, 15 Oct 2015 20:27:58 +0000 (16:27 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 15 Oct 2015 20:27:58 +0000 (16:27 -0400)

Trivial merge