Merge branch 'miditap', thanks to Tres Seaver for his contributions