Merge branch 'fixes' into misc

This commit is contained in:
James Bottomley 2016-05-17 21:12:50 -04:00
commit e7ca7f9fa2
145 changed files with 1040 additions and 774 deletions