Merge branch '6663-bugfixes' refs #6663
authorTom Clegg <tom@curoverse.com>
Thu, 30 Jul 2015 19:16:43 +0000 (15:16 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 30 Jul 2015 19:16:43 +0000 (15:16 -0400)

Trivial merge