Merge Vincent's repo with central one.