Merge branch 'next' (early part) into mh-vala-support