Pull in some changes from the cupcake-dashboard.