Merge pull request #3481 from alexrp/master