Merge branch 'meta-fixes' into 0.2.0-b3