Merge branch 'master' into 4.next
authorJeremy Harris <jgh146exb@wizmail.org>
Sat, 25 Nov 2017 19:39:32 +0000 (19:39 +0000)
committerJeremy Harris <jgh146exb@wizmail.org>
Sat, 25 Nov 2017 19:39:32 +0000 (19:39 +0000)

Trivial merge