branch merge

2012-04-05, Edouard Tisserant