Merge branch 'misc-fixes' into k.o/for-4.8-rc
authorDoug Ledford <[email protected]>
Thu, 25 Aug 2016 15:17:10 +0000 (11:17 -0400)
committerDoug Ledford <[email protected]>
Thu, 25 Aug 2016 15:17:10 +0000 (11:17 -0400)

Trivial merge