Merge branch 'kwadronaut/platform-8862'
authorMicah Anderson <micah@riseup.net>
Thu, 5 Oct 2017 23:29:39 +0000 (19:29 -0400)
committerMicah Anderson <micah@riseup.net>
Thu, 5 Oct 2017 23:29:39 +0000 (19:29 -0400)

Trivial merge