Merge branch 'fix-automoc-compile-definitions' into release