Merge branch 'strugee-patch-2'

This commit is contained in:
Andrew David Wong 2018-12-18 23:53:37 -06:00
commit 471473ea94
No known key found for this signature in database
GPG Key ID: 8CE137352A019A17