Merge remote-tracking branch 'gravitystorm/terms_capabilities'
authorTom Hughes <tom@compton.nu>
Wed, 2 Jan 2019 17:24:18 +0000 (17:24 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 2 Jan 2019 17:24:18 +0000 (17:24 +0000)

Trivial merge