Merge branch 'cadet-new-options'
authort3sserakt <t3ss@posteo.de>
Sun, 21 Jul 2019 18:18:24 +0000 (20:18 +0200)
committert3sserakt <t3ss@posteo.de>
Sun, 21 Jul 2019 18:18:24 +0000 (20:18 +0200)

Trivial merge