Merge branch 'master' into pucked.
authorMatt Birkholz <matt@birchwood-abbey.net>
Sun, 2 Jul 2017 20:50:29 +0000 (13:50 -0700)
committerMatt Birkholz <matt@birchwood-abbey.net>
Sun, 2 Jul 2017 20:50:29 +0000 (13:50 -0700)

Trivial merge