Merge branch 'master' into 4.next
authorJeremy Harris <jgh146exb@wizmail.org>
Tue, 3 Oct 2017 15:12:17 +0000 (16:12 +0100)
committerJeremy Harris <jgh146exb@wizmail.org>
Tue, 3 Oct 2017 15:12:17 +0000 (16:12 +0100)

Trivial merge