Merge from the "benoit" branch.