Allow merging meta with root element
Merge branch 'master' into meta-in-root
Allow merging meta in associations