merge from open-source master
Jean-Baptiste Queru authored
94ba73d4