Merge branch 'xwiki'
Cédric de Saint Martin authored
f9278dca