Updated to xwiki 6.1