Merge pull request #1320 from grandoc/3.5

3.5