Merge branch '8177-keep-web-trust-all-content-flag' closes #8177
authorTom Clegg <tom@curoverse.com>
Wed, 20 Jan 2016 02:12:38 +0000 (21:12 -0500)
committerTom Clegg <tom@curoverse.com>
Wed, 20 Jan 2016 02:12:38 +0000 (21:12 -0500)

Trivial merge