Merge pull request #1 from xwiki/master

Update