Merge branch '7173-jessie' refs #7173
authorTom Clegg <tom@curoverse.com>
Thu, 15 Oct 2015 16:21:07 +0000 (12:21 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 15 Oct 2015 16:21:07 +0000 (12:21 -0400)

Trivial merge