Psuedomerge to tie in 4.0 history.
authorplugwash <plugwash@thinkpad>
Thu, 7 Sep 2017 06:02:37 +0000 (07:02 +0100)
committerplugwash <plugwash@thinkpad>
Thu, 7 Sep 2017 06:02:37 +0000 (07:02 +0100)

Trivial merge