add missing @include
Merge branch 'master' into v0.5-rc
Merge branch 'v0.5-rc' into v0.5-rc-full