Hidendra merged my patch! Let's use that!
Merge remote-tracking branch 'origin/v2.0' into EntityRewrite