Restore changes removed from bad merge
Merge pull request #382 from flodolo/merge_failure

Restore changes removed from failed merge
Update release notes and app version for 3.5.1
Merge pull request #384 from flodolo/changelog_3_5_1

Update release notes and app version for 3.5.1
Changelog: add link to Github's change log