Merge branch 'master' into 4.next
authorJeremy Harris <jgh@wizmail.org>
Sun, 1 Oct 2017 14:36:32 +0000 (15:36 +0100)
committerJeremy Harris <jgh@wizmail.org>
Sun, 1 Oct 2017 14:36:32 +0000 (15:36 +0100)

Trivial merge