oops, also include new partial (complements 50b7102eb545ab91179e22abf26aa7575bb89b8b)
Merge branch 'uicleanup' into foodcoop-adam