Sync with latest omnibus-software revision