Reconcile cupcake history into donut

Merge commit '5d6d773fab559fdc12e553d60d789f3991ac552c' into HEAD