Sync 4.next from master
authorJeremy Harris <jgh146exb@wizmail.org>
Thu, 29 Dec 2016 20:34:10 +0000 (20:34 +0000)
committerJeremy Harris <jgh146exb@wizmail.org>
Thu, 29 Dec 2016 20:39:27 +0000 (20:39 +0000)

Trivial merge