merge of the actual master into the 3.x branch