Merge pull request #1772 from jimis/master

3.6.x changes missing from master.