Merge branch 'master' into pucked.
authorMatt Birkholz <matt@birchwood-abbey.net>
Sat, 16 Sep 2017 22:43:31 +0000 (15:43 -0700)
committerMatt Birkholz <matt@birchwood-abbey.net>
Sat, 16 Sep 2017 22:43:31 +0000 (15:43 -0700)

Trivial merge