Merge branch '7173-jessie'
authorTom Clegg <tom@curoverse.com>
Sat, 17 Oct 2015 04:39:25 +0000 (00:39 -0400)
committerTom Clegg <tom@curoverse.com>
Sat, 17 Oct 2015 04:39:25 +0000 (00:39 -0400)
closes #7173


Trivial merge