Merge branch 'feld-test.secret' into feld-warnings
authorMark Felder <feld@feld.me>
Fri, 4 May 2018 21:02:14 +0000 (21:02 +0000)
committerMark Felder <feld@feld.me>
Fri, 4 May 2018 21:02:14 +0000 (21:02 +0000)

Trivial merge