Merge branch 'master' into pucked.
authorMatt Birkholz <matt@birchwood-abbey.net>
Tue, 2 May 2017 04:48:44 +0000 (21:48 -0700)
committerMatt Birkholz <matt@birchwood-abbey.net>
Tue, 2 May 2017 04:48:44 +0000 (21:48 -0700)

Trivial merge