Merge branch 'master' into pucked.
authorMatt Birkholz <matt@birchwood-abbey.net>
Tue, 19 Sep 2017 03:19:30 +0000 (20:19 -0700)
committerMatt Birkholz <matt@birchwood-abbey.net>
Tue, 19 Sep 2017 03:19:30 +0000 (20:19 -0700)

Trivial merge