Release: v2.3.5.
Merge pull request #1565 from am11/master

Release: v2.3.5