Merge branch 'miditap', thanks to Tres Seaver for his contributions
authorPaul Brossier <piem@piem.org>
Thu, 12 Jan 2017 22:03:06 +0000 (23:03 +0100)
committerPaul Brossier <piem@piem.org>
Thu, 12 Jan 2017 22:03:06 +0000 (23:03 +0100)

Trivial merge