Merge branch 'master' into v2.1.0
Merge pull request #1 from Dervol03/v2.1.0

Merge branch 'master' into v2.1.0