Merge branch 'master' into 4.next
authorJeremy Harris <jgh146exb@wizmail.org>
Sat, 11 Nov 2017 16:20:02 +0000 (16:20 +0000)
committerJeremy Harris <jgh146exb@wizmail.org>
Sat, 11 Nov 2017 16:20:02 +0000 (16:20 +0000)

Trivial merge