Added by Alexandre Quessy about 3 years ago
Merged changes in trunk since r5648 to branches/synchronize