Merge branch 'fixes-merge-window-pt2' into fixes
authorTony Lindgren <tony@atomide.com>
Mon, 23 Sep 2019 17:38:20 +0000 (10:38 -0700)
committerTony Lindgren <tony@atomide.com>
Mon, 23 Sep 2019 17:38:20 +0000 (10:38 -0700)

Trivial merge