fixed syntax error
version bump
Merge branch 'master' into develop
Release 1.6.21-2 for wheezy and gentoo
Merge branch 'master' into develop