Last commit before the Qt merge