fixed a typo
Merge branch 'zkessin/develop' into develop