Merge branch 'master' into next
authorJohn Wiegley <johnw@newartisans.com>
Mon, 4 Dec 2017 20:10:26 +0000 (12:10 -0800)
committerJohn Wiegley <johnw@newartisans.com>
Mon, 4 Dec 2017 20:10:26 +0000 (12:10 -0800)

Trivial merge