Version bump
Merge branch 'master' into debian
Packaging version 0.2