fixup merge
authorDan White <dan@whiteaudio.com>
Sun, 7 May 2017 01:06:49 +0000 (20:06 -0500)
committerDan White <dan@whiteaudio.com>
Sun, 7 May 2017 01:06:49 +0000 (20:06 -0500)

Trivial merge