Merge branch 'merge' into next

Brings in various bug fixes from 3.6-rcX