Merge remote-tracking branch 'origin/master' into release/cheetah
Merge remote-tracking branch 'origin/master' into release/cheetah
Merge pull request #831 from onepercentclub/master

Merge master into release/cheetah
merge conflict fix
Merge pull request #823 from onepercentclub/release/cheetah

Merge release/cheetah into develop