Merge branch 'hotfix/18.1.2'
Small typo, stray quote
Merge branch 'hotfix/18.1.3' into develop