Merge branch 'k.o/for-4.10-rc' into HEAD

This commit is contained in:
Doug Ledford 2017-02-19 09:18:21 -05:00
commit 6dd7abae71
30 changed files with 283 additions and 196 deletions