Merge branch '7311-temp-base' closes #7311
authorTom Clegg <tom@curoverse.com>
Sat, 12 Sep 2015 02:25:30 +0000 (22:25 -0400)
committerTom Clegg <tom@curoverse.com>
Sat, 12 Sep 2015 02:25:30 +0000 (22:25 -0400)

Trivial merge