Merge remote-tracking branch 'mgorny/fb2'