Merge remote-tracking branch 'my0xacab/feat/v3_hs'
authorMicah Anderson <micah@riseup.net>
Tue, 24 Oct 2017 13:52:41 +0000 (09:52 -0400)
committerMicah Anderson <micah@riseup.net>
Tue, 24 Oct 2017 13:52:41 +0000 (09:52 -0400)

Trivial merge