fixed typo
Merge branch 'develop' into testing