Merge "Rub in a little 'ol log-b-gone." into gingerbread