Updating master's fixes