Merge pull request #4838 from senivam/3x_merged

merge master into 3.x