[lzop/f13/master: 5/5] Merge remote branch 'origin/master' into f13