Merge master in dev/donations
Merge pull request #1735 from onepercentclub/feature/merge-master-donations

Merge master into dev/donations