Sync 4.next from master
authorJeremy Harris <jgh146exb@wizmail.org>
Mon, 13 Mar 2017 11:12:58 +0000 (11:12 +0000)
committerJeremy Harris <jgh146exb@wizmail.org>
Mon, 13 Mar 2017 11:14:43 +0000 (11:14 +0000)

Trivial merge