merge master into project branch

the title is enough explicite