Merge pull request #4932 from senivam/31_merged

merge actual master into 3.1