Merge(integrated) revisions done on the trunk between 5526:5536. In fact it corresponds only to the bug correction in revision [5536]. N.Vuichard, J Ghattas