Evidently I for got to pop stash.
Merge topic 'INTERFACE_AUTOUIC_OPTIONS' into next

fcc0f09 Evidently I for got to pop stash.