Merge branch 'develop'
Released version 0.5.1-2
Released version 0.5.1-2 for Wheezy
Merge branch 'master' into develop