Merge "(bug 36568) Fixed "Illegal string offset 'LIMIT'" warnings in updater"