Merge branch '4882-no-host-when-container' closes #4882
authorTom Clegg <tom@curoverse.com>
Fri, 8 May 2015 06:42:08 +0000 (02:42 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 8 May 2015 06:42:08 +0000 (02:42 -0400)

Trivial merge