Merge remote branches 'ponder' and 'crybaby'