Sync from packages

Signed-off-by: David Sterba <dave@jikos.cz>