Merging the changes made by Nuxeo into the Build branch