am ba9ec441: Merge "Activate the "XInclude" feature by default"

* commit 'ba9ec441bf16e801106029292e6e51a7909373b6':
  Activate the "XInclude" feature by default