Fix typo
Merge branch 'develop' into feature/centos_support