fix typo
Merge branch 'dev' into cris