Merge pull request #3562 from omerida/master