Fix clone of master branch on install
Merge branch 'hotfix/v2.0.18'
Merge tag 'v2.0.18' into develop

hotfix/v2.0.18