Updating to the last upstream changes (wrong merge was fixed).