Merge remote-tracking branch 'barak/master' into debian