Merge branch 'tkorvola-sdl'
authorDavid Griffith <dave@661.org>
Sun, 11 Mar 2018 11:50:32 +0000 (04:50 -0700)
committerDavid Griffith <dave@661.org>
Sun, 11 Mar 2018 11:50:32 +0000 (04:50 -0700)

Trivial merge