Merge branch 'merge' into next

Bring in some important fixes from the 3.16 branch