Merge branch '9956-keepstore-config' refs #9956
authorTom Clegg <tom@curoverse.com>
Mon, 17 Oct 2016 10:16:04 +0000 (06:16 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 17 Oct 2016 10:16:04 +0000 (06:16 -0400)

Trivial merge