Merge branch 'upstream'
log changes
Merge remote-tracking branch 'barak/master' into debian