Merge branch 'develop'
Release 1.6.19-2 for wheezy and gentoo
Merge branch 'develop'
Release 1.6.20-2 for wheezy and gentoo
Merge branch 'master' into develop