Fix typo
Merge branch 'dev' into cleandep